# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.757.13.14 -> 1.757.13.15 # drivers/scsi/scsi_ioctl.c 1.8 -> 1.9 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/12/02 agrover@groveronline.com 1.757.14.9 # ACPI: Remove incorrect comment # -------------------------------------------- # 02/12/02 linux-bt.adm@hostme.bitkeeper.com 1.773 # Merge bk://linux.bkbits.net/linux-2.4 # into hostme.bitkeeper.com:/ua/repos/l/linux-bt/bt-2.4 # -------------------------------------------- # 02/12/02 linux-bt.adm@hostme.bitkeeper.com 1.774 # Merge hostme.bitkeeper.com:/ua/repos/l/linux-bt/bt-2.4 # into hostme.bitkeeper.com:/ua/repos/l/linux-bt/marcel-2.4 # -------------------------------------------- # 02/12/02 jgarzik@redhat.com 1.757.38.18 # Merge redhat.com:/home/jgarzik/repo/marcelo-2.4 # into redhat.com:/home/jgarzik/repo/net-drivers-2.4 # -------------------------------------------- # 02/12/02 agrover@groveronline.com 1.757.14.10 # Merge groveronline.com:/root/bk/linux-2.4 # into groveronline.com:/root/bk/linux-2.4-acpi # -------------------------------------------- # 02/12/02 alex_williamson@hp.com 1.757.29.16 # ia64: If no CPE interrupt, poll periodically for CPEs. # -------------------------------------------- # 02/12/02 akropel1@rochester.rr.com 1.757.38.19 # [netdrvr ewrk3] fix and enable ethtool phys-id ioctl # -------------------------------------------- # 02/12/02 akropel1@rochester.rr.com 1.757.38.20 # [netdrvr ewrk3] allow user to change MAC address via SIOCSIFHWADDR # -------------------------------------------- # 02/12/02 jgarzik@redhat.com 1.757.38.21 # [netdrvr] zap PCI_VPD_ADDR constants from skfp, sk98lin drivers # # They were unused, incorrect, and conflicting with defines # added to linux/pci.h. # # Spotted by DaveM. # -------------------------------------------- # 02/12/02 jgarzik@redhat.com 1.757.38.22 # [netdrvr r8169] use pci_[gs]et_drvdata instead of pdev->driver_data # # Fixes build in 2.5.x, works in 2.4.x just fine, and takes driver # closer to 2.2.x compatibility. # -------------------------------------------- # 02/12/02 maxk@qualcomm.com 1.775 # Ordinary users are not allowed to use raw L2CAP sockets. # -------------------------------------------- # 02/12/02 jgarzik@redhat.com 1.757.38.23 # Clarify locking/context docs for network interfaces, # in Documentation/networking/netdevices.txt. # -------------------------------------------- # 02/12/02 jgarzik@redhat.com 1.757.44.1 # Merge redhat.com:/home/jgarzik/repo/marcelo-2.4 # into redhat.com:/home/jgarzik/repo/misc-2.4 # -------------------------------------------- # 02/12/02 maxk@qualcomm.com 1.776 # BNEP extension headers handling fix. # -------------------------------------------- # 02/12/03 jfs.adm@hostme.bitkeeper.com 1.757.31.7 # Merge bk://linux.bkbits.net/linux-2.4 # into hostme.bitkeeper.com:/ua/repos/j/jfs/linux-2.4 # -------------------------------------------- # 02/12/03 shaggy@shaggy.austin.ibm.com 1.757.1.14 # Merge shaggy.austin.ibm.com:/home/shaggy/bk/jfs-2.4 # into shaggy.austin.ibm.com:/shaggy/bk/perf-2.4 # -------------------------------------------- # 02/12/03 bjorn_helgaas@hp.com 1.757.29.17 # ia64: Fix race between TLB purges and reload_context. # (From David Mosberger) # -------------------------------------------- # 02/12/03 bjorn_helgaas@hp.com 1.757.29.18 # ia64: Include vendor/function ID for "Unknown" IOCs. # -------------------------------------------- # 02/12/03 shaggy@shaggy.austin.ibm.com 1.757.31.8 # jfs_truncate needs to call block_truncate_page. # Moved the function from file.c to inode.c since block_truncate_page uses # jfs_get_block which is static. # -------------------------------------------- # 02/12/03 eranian@frankl.hpl.hp.com 1.757.29.19 # ia64: perfmon: This patch adds: # - full support for randomization of sampling periods # - a hook for VTune and possibly Prospect so that they can # synchronize access to the PMU with perfmon # - updates the initialization to reflect what I have in my development # kernel (we do not use PAL anymore). # - update perfmon version to 1.2 # # This patch fixes: # - the bug your reported about perfmon_init_percpu() # -------------------------------------------- # 02/12/03 davem@nuts.ninka.net 1.757.36.10 # [SPARC]: Synchronize MAINTAINERS entry with 2.5.x # -------------------------------------------- # 02/12/03 venkatesh.pallipadi@intel.com 1.757.29.20 # [PATCH] ia64: Save/Restore of IA32 fpstate in sigcontext # # The IA32 fpstate information is not getting saved/restored during IA32 # exception handling. The issue was first observed due to an IA32 binary # (which runs fine on IA32 system), failing on Itanium based system. The # binary was trying to access the fpstate information during an FPE and got a # SEGV, as the fpstate was not getting saved and the sigcontext->fpstate # pointer was NULL. # -------------------------------------------- # 02/12/03 venkatesh.pallipadi@intel.com 1.757.29.21 # [PATCH] ia64: Clearing of exception status before calling IA32 user signal handler # # One more bug fix for IA32 exception handler. IA32 exception handler is # not clearing the exception status, before calling the user signal handler # routine. # -------------------------------------------- # 02/12/03 davidm@tiger.hpl.hp.com 1.757.29.22 # ia64: Some formatting cleanups. # -------------------------------------------- # 02/12/03 davidm@tiger.hpl.hp.com 1.757.29.23 # ia64: Patch by Venkatesh Pallipadi to fix IA-32 signal handling to restore # instruction and data pointers. # -------------------------------------------- # 02/12/03 venkatesh.pallipadi@intel.com 1.757.29.24 # ia64: IA-32 ptrace: xmm reg support, fpstate 'tag' fix, fp TOS fix # # Attached is the patch to IA32 ptrace code in IA64 kernel. This # patch basically helps gdb'ing of an ia32 app (with ia32 # gdb binary). The patch can easily be verified by running gdb and # looking at all-registers. # # The changes done in the patch include: # 1) Support for xmm registers. # At present xmm registers are not saved/restored during # ptrace and gdb wont show them. Patch adds new ptrace # options (IA32_PTRACE_GETFPXREGS and IA32_PTRACE_SETFPXREGS, # used by gdb to get/set fp+xmm state). # 2) Bug fix in getting 'tag' field of fpstate # (fsr>>16 in place of fsr>>32) # 3) Bug fix in calculating fp TOS # (it is a 3 bit field in fsr. Using (fsr>>11) & 7 in place # of (fsr>>11) & 3) # Also, I had to add new structures in ia32.h, corresponding to # the way gdb is expecting the data. Gdb uses structures # defined in sys/user.h # -------------------------------------------- # 02/12/04 shaggy@shaggy.austin.ibm.com 1.757.1.15 # Merge shaggy.austin.ibm.com:/home/shaggy/bk/jfs-2.4 # into shaggy.austin.ibm.com:/shaggy/bk/perf-2.4 # -------------------------------------------- # 02/12/04 bjorn_helgaas@hp.com 1.757.12.12 # Merge hp.com:/home/helgaas/bk/to-marcelo-2.4 # into hp.com:/home/helgaas/bk/linux-ia64-2.4 # -------------------------------------------- # 02/12/04 bjorn_helgaas@hp.com 1.757.12.13 # Merge hp.com:/home/helgaas/bk/ia64-extras # into hp.com:/home/helgaas/bk/linux-ia64-2.4 # -------------------------------------------- # 02/12/04 bjorn_helgaas@hp.com 1.757.13.15 # Whitespace fixup in scsi_ioctl (in old toolchain workaround). # -------------------------------------------- # diff -Nru a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c --- a/drivers/scsi/scsi_ioctl.c Wed Oct 8 09:06:47 2003 +++ b/drivers/scsi/scsi_ioctl.c Wed Oct 8 09:06:47 2003 @@ -199,7 +199,7 @@ int timeout, retries, result; int data_direction; #if __GNUC__ < 3 - int foo; + int foo; #endif if (!sic) @@ -211,11 +211,11 @@ return -EFAULT; #if __GNUC__ < 3 - foo = __get_user(inlen, &sic->inlen); + foo = __get_user(inlen, &sic->inlen); if(foo) return -EFAULT; - foo = __get_user(outlen, &sic->outlen); + foo = __get_user(outlen, &sic->outlen); if(foo) return -EFAULT; #else